Merge changes from emacs-23 branch
authorChong Yidong <cyd@gnu.org>
Mon, 9 Jan 2012 05:48:13 +0000 (13:48 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 9 Jan 2012 05:48:13 +0000 (13:48 +0800)

Trivial merge